nnimap.el: IMAP command logging improvement; When moving articles between IMAP server...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 67e7afd4ea32acae7804106cd7f59098f25ed724..81c91120a8f3457f919d5d035cc865cbc9ee7e89 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-log-command): Add the IMAP address to the log
+       buffer.  Suggested by Herbert Valerio Riedel.
+       (nnimap-request-move-article): Delete the message from the correct IMAP
+       server.
+
 2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
 
        * gnus-demon.el (gnus-demon-init): Don't multiply time twice.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c6f0f7a97e883dd805f4d417cd9f73c749a19a1b..6cbd83c8f78e6c0b29a79b21cce4ab03a76d0b1b 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -868,6 +868,7 @@ textual parts.")
          ;; Move the article to a different method.
          (let ((result (eval accept-form)))
            (when result
+             (nnimap-possibly-change-group group server)
              (nnimap-delete-article article)
              result)))))))
 
@@ -1706,7 +1707,8 @@ textual parts.")
   (when nnimap-record-commands
     (with-current-buffer (get-buffer-create "*imap log*")
       (goto-char (point-max))
-      (insert (format-time-string "%H:%M:%S") " "
+      (insert (format-time-string "%H:%M:%S")
+             " [" nnimap-address "] "
              (if nnimap-inhibit-logging
                  "(inhibited)\n"
                command))))